kill xmapwpt. (#757)

note is was wounded previously, see #754.

diff --git a/internal_styles.cc b/internal_styles.cc
index 81ce883da791fdf1873c5dd5b725e404fc312938..491ef63b2601778170538d3644336c6c750b3b33 100644 (file)
--- a/internal_styles.cc
+++ b/internal_styles.cc
@@ -1458,39 +1458,7 @@ static char xmap2006[] =
 
 
   ;
-static char xmapwpt[] =
-  "# gpsbabel XCSV style file\n"
-  "#\n"
-  "# Format: DeLorme Xmap HH Street Atlas USA .WPT (PocketPC)\n"
-  "# Author: Alex Mottram\n"
-  "#   Date: 12/09/2002\n"
-  "#\n"
-  "#\n"
-  "DESCRIPTION                 DeLorme XMat HH Street Atlas USA .WPT (PPC)\n"
-  "SHORTLEN            32\n"
-  "SHORTWHITE          0\n"
-
-  "#\n"
-  "#\n"
-  "# FILE LAYOUT DEFINITIONS:\n"
-  "#\n"
-  "FIELD_DELIMITER             COLON\n"
-  "RECORD_DELIMITER    NEWLINE\n"
-  "BADCHARS            COLON\n"
-
-  "#\n"
-  "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
-  "#\n"
-  "IFIELD      CONSTANT, \"1296126539\", \"%s\"\n"
-  "IFIELD      CONSTANT, \"1481466224\", \"%s\"\n"
-  "IFIELD      LAT_INT32DEG, \"\", \"%d\"\n"
-  "IFIELD      LON_INT32DEG, \"\", \"%d\"\n"
-  "IFIELD      CONSTANT, \"3137157\", \"%s\"\n"
-  "IFIELD      SHORTNAME, \"\", \"%-.31s\"\n"
-  "IFIELD      IGNORE, \"\", \"%-.31s\"\n"
-  "IFIELD      DESCRIPTION, \"\", \"%-.78s\"\n"
-  ;
-const QVector<style_vecs_t> style_list = {{ "xmapwpt", xmapwpt }, { "xmap2006", xmap2006 }, { "xmap", xmap }, { "tomtom_itn_places", tomtom_itn_places }, { "tomtom_itn", tomtom_itn }, { "tomtom_asc", tomtom_asc }, { "tabsep", tabsep }, { "saplus", saplus }, { "s_and_t", s_and_t }, { "ricoh", ricoh }, { "openoffice", openoffice }, { "nima", nima }, { "navigonwpt", navigonwpt }, { "mxf", mxf }, { "motoactv", motoactv }, { "mapconverter", mapconverter }, { "mainnav", mainnav }, { "land_air_sea", land_air_sea }, { "kompass_wp", kompass_wp }, { "kompass_tk", kompass_tk }, { "igoprimo_poi", igoprimo_poi }, { "igo2008_poi", igo2008_poi }, { "iblue757", iblue757 }, { "iblue747", iblue747 }, { "gpsman", gpsman }, { "gpsdrivetrack", gpsdrivetrack }, { "gpsdrive", gpsdrive }, { "geonet", geonet }, { "garmin_poi", garmin_poi }, { "garmin_g1000", garmin_g1000 }, { "garmin301", garmin301 }, { "fugawi", fugawi }, { "flysight", flysight }, { "dna", dna }, { "custom", custom }, { "cup", cup }, { "csv", csv }, { "cambridge", cambridge }, { "arc", arc }};
+const QVector<style_vecs_t> style_list = {{ "xmap2006", xmap2006 }, { "xmap", xmap }, { "tomtom_itn_places", tomtom_itn_places }, { "tomtom_itn", tomtom_itn }, { "tomtom_asc", tomtom_asc }, { "tabsep", tabsep }, { "saplus", saplus }, { "s_and_t", s_and_t }, { "ricoh", ricoh }, { "openoffice", openoffice }, { "nima", nima }, { "navigonwpt", navigonwpt }, { "mxf", mxf }, { "motoactv", motoactv }, { "mapconverter", mapconverter }, { "mainnav", mainnav }, { "land_air_sea", land_air_sea }, { "kompass_wp", kompass_wp }, { "kompass_tk", kompass_tk }, { "igoprimo_poi", igoprimo_poi }, { "igo2008_poi", igo2008_poi }, { "iblue757", iblue757 }, { "iblue747", iblue747 }, { "gpsman", gpsman }, { "gpsdrivetrack", gpsdrivetrack }, { "gpsdrive", gpsdrive }, { "geonet", geonet }, { "garmin_poi", garmin_poi }, { "garmin_g1000", garmin_g1000 }, { "garmin301", garmin301 }, { "fugawi", fugawi }, { "flysight", flysight }, { "dna", dna }, { "custom", custom }, { "cup", cup }, { "csv", csv }, { "cambridge", cambridge }, { "arc", arc }};
 #else /* CSVFMTS_ENABLED */
 const QVector<style_vecs_t> style_list;
 #endif /* CSVFMTS_ENABLED */

diff --git a/reference/format0.txt b/reference/format0.txt
index bbb7aa5e1e06aa228da971adec9afec0048134a3..909ed0b60c7cbcf4e27c8dbe13bccdfb0dee2616 100644 (file)
--- a/reference/format0.txt
+++ b/reference/format0.txt
@@ -11,7 +11,6 @@ saplus                DeLorme Street Atlas Plus
 saroute        anr     DeLorme Street Atlas Route
 xmap   wpt     DeLorme XMap HH Native .WPT
 xmap2006       txt     DeLorme XMap/SAHH 2006 Native .TXT
-xmapwpt                DeLorme XMat HH Street Atlas USA .WPT (PPC)
 destinator_itn dat     Destinator Itineraries (.dat)
 destinator_poi dat     Destinator Points of Interest (.dat)
 destinator_trl dat     Destinator TrackLogs (.dat)

diff --git a/reference/format1.txt b/reference/format1.txt
index ef7198e1a13fa4f753f07417e6310e2cd49af2cd..24efe65652bff5fba034e7ae310469603a45249a 100644 (file)
--- a/reference/format1.txt
+++ b/reference/format1.txt
@@ -14,7 +14,6 @@ file  saplus          DeLorme Street Atlas Plus
 file   saroute anr     DeLorme Street Atlas Route
 file   xmap    wpt     DeLorme XMap HH Native .WPT
 file   xmap2006        txt     DeLorme XMap/SAHH 2006 Native .TXT
-file   xmapwpt         DeLorme XMat HH Street Atlas USA .WPT (PPC)
 file   destinator_itn  dat     Destinator Itineraries (.dat)
 file   destinator_poi  dat     Destinator Points of Interest (.dat)
 file   destinator_trl  dat     Destinator TrackLogs (.dat)

diff --git a/reference/format2.txt b/reference/format2.txt
index 7250f49b7d5a24c4505963ebf8f9f3cacc5bf01b..a5ede11fe9101656e5dc5fb3d2896d725a9ca5cb 100644 (file)
--- a/reference/format2.txt
+++ b/reference/format2.txt
@@ -14,7 +14,6 @@ file  rw----  saplus          DeLorme Street Atlas Plus
 file   --r---  saroute anr     DeLorme Street Atlas Route
 file   rw----  xmap    wpt     DeLorme XMap HH Native .WPT
 file   rw----  xmap2006        txt     DeLorme XMap/SAHH 2006 Native .TXT
-file   rw----  xmapwpt         DeLorme XMat HH Street Atlas USA .WPT (PPC)
 file   ----rw  destinator_itn  dat     Destinator Itineraries (.dat)
 file   rw----  destinator_poi  dat     Destinator Points of Interest (.dat)
 file   --rw--  destinator_trl  dat     Destinator TrackLogs (.dat)

diff --git a/reference/format3.txt b/reference/format3.txt
index d59c5246f00bd80e29d7fb7e084301433024d00a..3dcdb23708c1599428ddba918f6e3a760a722ccf 100644 (file)
--- a/reference/format3.txt
+++ b/reference/format3.txt
@@ -190,22 +190,6 @@ option     xmap2006        prefer_shortnames       Use shortname instead of description    boolean
 
 option xmap2006        datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmap2006.html#fmt_xmap2006_o_datum
 
-file   rw----  xmapwpt         DeLorme XMat HH Street Atlas USA .WPT (PPC)     xcsv
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html
-option xmapwpt snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_snlen
-
-option xmapwpt snwhite Allow whitespace synth. shortnames      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_snwhite
-
-option xmapwpt snupper UPPERCASE synth. shortnames     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_snupper
-
-option xmapwpt snunique        Make synth. shortnames unique   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_snunique
-
-option xmapwpt urlbase Basename prepended to URL on output     string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_urlbase
-
-option xmapwpt prefer_shortnames       Use shortname instead of description    boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_prefer_shortnames
-
-option xmapwpt datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_xmapwpt.html#fmt_xmapwpt_o_datum
-
 file   ----rw  destinator_itn  dat     Destinator Itineraries (.dat)   destinator_itn
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_destinator_itn.html
 file   rw----  destinator_poi  dat     Destinator Points of Interest (.dat)    destinator_poi

diff --git a/reference/help.txt b/reference/help.txt
index af672decc04ccd229969f9ef4a6055b92e6d481f..fef6a1a4733042908c6d2d811e755bf658020c4f 100644 (file)
--- a/reference/help.txt
+++ b/reference/help.txt
@@ -103,14 +103,6 @@ File Types (-i and -o options):
          urlbase               Basename prepended to URL on output 
          prefer_shortnames     (0/1) Use shortname instead of description 
          datum                 GPS datum (def. WGS 84) 
-       xmapwpt               DeLorme XMat HH Street Atlas USA .WPT (PPC)
-         snlen                 Max synthesized shortname length 
-         snwhite               (0/1) Allow whitespace synth. shortnames 
-         snupper               (0/1) UPPERCASE synth. shortnames 
-         snunique              (0/1) Make synth. shortnames unique 
-         urlbase               Basename prepended to URL on output 
-         prefer_shortnames     (0/1) Use shortname instead of description 
-         datum                 GPS datum (def. WGS 84) 
        destinator_itn        Destinator Itineraries (.dat)
        destinator_poi        Destinator Points of Interest (.dat)
        destinator_trl        Destinator TrackLogs (.dat)

diff --git a/reference/xmapwpt.wpt b/reference/xmapwpt.wpt
deleted file mode 100644 (file)
index 48885aa..0000000
--- a/reference/xmapwpt.wpt
+++ /dev/null
@@ -1,9 +0,0 @@
-1296126539:1481466224:1845728360:1416544806:3137157:GCEBB::Mountain Bike Heaven by susy1313
-1296126539:1481466224:1844733052:1420362881:3137157:GC1A37::The Troll by a182pilot & Family
-1296126539:1481466224:1845525076:1420861444:3137157:GC1C2B::Dive Bomber by JoGPS & family
-1296126539:1481466224:1845170937:1420622369:3137157:GC25A9::FOSTER by JoGPS & Family
-1296126539:1481466224:1844552696:1419840970:3137157:GC2723::Logan Lighthouse by JoGps & Family
-1296126539:1481466224:1844956189:1419432025:3137157:GC2B71::Ganier Cache by Susy1313
-1296126539:1481466224:1844757518:1419270824:3137157:GC309F::Shy's Hill by FireFighterEng33
-1296126539:1481466224:1845011414:1418580721:3137157:GC317A::GittyUp by JoGPS / Warner Parks
-1296126539:1481466224:1844799182:1418788060:3137157:GC317D::Inlighting by JoGPS / Warner Parks

diff --git a/style/deprecated/xmapwpt.style b/style/deprecated/xmapwpt.style
new file mode 100644 (file)
index 0000000..4f0d03b
--- /dev/null
+++ b/style/deprecated/xmapwpt.style
@@ -0,0 +1,30 @@
+# gpsbabel XCSV style file
+#
+# Format: DeLorme Xmap HH Street Atlas USA .WPT (PocketPC)
+# Author: Alex Mottram
+#   Date: 12/09/2002
+#
+#
+DESCRIPTION            DeLorme XMat HH Street Atlas USA .WPT (PPC)
+SHORTLEN               32
+SHORTWHITE             0
+
+#
+#
+# FILE LAYOUT DEFINITIONS:
+#
+FIELD_DELIMITER                COLON
+RECORD_DELIMITER       NEWLINE
+BADCHARS               COLON
+
+#
+# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
+#
+IFIELD CONSTANT, "1296126539", "%s"
+IFIELD CONSTANT, "1481466224", "%s"
+IFIELD LAT_INT32DEG, "", "%d"
+IFIELD LON_INT32DEG, "", "%d"
+IFIELD CONSTANT, "3137157", "%s"
+IFIELD SHORTNAME, "", "%-.31s"
+IFIELD IGNORE, "", "%-.31s"
+IFIELD DESCRIPTION, "", "%-.78s"

diff --git a/style/xmapwpt.style b/style/xmapwpt.style
deleted file mode 100644 (file)
index 4f0d03b..0000000
--- a/style/xmapwpt.style
+++ /dev/null
@@ -1,30 +0,0 @@
-# gpsbabel XCSV style file
-#
-# Format: DeLorme Xmap HH Street Atlas USA .WPT (PocketPC)
-# Author: Alex Mottram
-#   Date: 12/09/2002
-#
-#
-DESCRIPTION            DeLorme XMat HH Street Atlas USA .WPT (PPC)
-SHORTLEN               32
-SHORTWHITE             0
-
-#
-#
-# FILE LAYOUT DEFINITIONS:
-#
-FIELD_DELIMITER                COLON
-RECORD_DELIMITER       NEWLINE
-BADCHARS               COLON
-
-#
-# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
-#
-IFIELD CONSTANT, "1296126539", "%s"
-IFIELD CONSTANT, "1481466224", "%s"
-IFIELD LAT_INT32DEG, "", "%d"
-IFIELD LON_INT32DEG, "", "%d"
-IFIELD CONSTANT, "3137157", "%s"
-IFIELD SHORTNAME, "", "%-.31s"
-IFIELD IGNORE, "", "%-.31s"
-IFIELD DESCRIPTION, "", "%-.78s"

diff --git a/testo.d/deprecated/xmapwpt.test b/testo.d/deprecated/xmapwpt.test
new file mode 100644 (file)
index 0000000..80fdbb1
--- /dev/null
+++ b/testo.d/deprecated/xmapwpt.test
@@ -0,0 +1,6 @@
+
+# XMapHH Street Atlas USA file format
+rm -f ${TMPDIR}/xmapwpt.wpt ${TMPDIR}/xmapwpt.xmapwpt
+gpsbabel -i xmapwpt -f ${REFERENCE}/xmapwpt.wpt -o xmapwpt -F ${TMPDIR}/xmapwpt.xmapwpt
+gpsbabel -i xmapwpt -f ${TMPDIR}/xmapwpt.xmapwpt -o xmapwpt -F ${TMPDIR}/xmapwpt.wpt
+compare ${TMPDIR}/xmapwpt.wpt ${REFERENCE}

diff --git a/testo.d/xmapwpt.test b/testo.d/xmapwpt.test
deleted file mode 100644 (file)
index 80fdbb1..0000000
--- a/testo.d/xmapwpt.test
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# XMapHH Street Atlas USA file format
-rm -f ${TMPDIR}/xmapwpt.wpt ${TMPDIR}/xmapwpt.xmapwpt
-gpsbabel -i xmapwpt -f ${REFERENCE}/xmapwpt.wpt -o xmapwpt -F ${TMPDIR}/xmapwpt.xmapwpt
-gpsbabel -i xmapwpt -f ${TMPDIR}/xmapwpt.xmapwpt -o xmapwpt -F ${TMPDIR}/xmapwpt.wpt
-compare ${TMPDIR}/xmapwpt.wpt ${REFERENCE}